projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a7523f2) | patch
* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based
authorDavid Kastrup <dak@gnu.org>
Mon, 25 Nov 2013 15:40:31 +0000 (10:40 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 25 Nov 2013 15:40:31 +0000 (10:40 -0500)
commitee41696a9d0db64c71d2952cfadb16663d9fbfff
treee4e8d1ac55791332d3ffe97320ed2e6a3c749a45tree | snapshot
parenta7523f22feab56b6b6a1be5c11b9ee702bdc66bfcommit | diff
* lisp/vc/smerge-mode.el (smerge-ediff): Choose default buffer names based
on the conflict markers when available.
(smerge--get-marker): New function.
(smerge-end-re, smerge-base-re): Add subgroup.
lisp/ChangeLog diff | blob | history
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.